gsk vulkan: Use new api in the glyph cache
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Wed, 20 Sep 2017 23:12:16 +0000 (19:12 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 21 Sep 2017 03:26:14 +0000 (23:26 -0400)
Use the newly introduced gsk_vulkan_image_new_for_atlas.

gsk/gskvulkanglyphcache.c

index 0be019d7f78e42b384b1e40a0a37bb6bd8c64798..bf0a0621f7cb1007587b29e37ae74ff4c69dff3b 100644 (file)
@@ -322,18 +322,7 @@ gsk_vulkan_glyph_cache_get_glyph_image (GskVulkanGlyphCache *cache,
   atlas = g_ptr_array_index (cache->atlases, index);
 
   if (atlas->image == NULL)
-    {
-      cairo_surface_t *surface;
-
-      /* FIXME: create the image without uploading data pointlessly */
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, atlas->width, atlas->height);
-      atlas->image = gsk_vulkan_image_new_from_data (uploader,
-                                                     cairo_image_surface_get_data (surface),
-                                                     cairo_image_surface_get_width (surface),
-                                                     cairo_image_surface_get_height (surface),
-                                                     cairo_image_surface_get_stride (surface));
-      cairo_surface_destroy (surface);
-    }
+    atlas->image = gsk_vulkan_image_new_for_atlas (cache->vulkan, atlas->width, atlas->height);
 
   for (l = atlas->dirty_glyphs; l; l = l->next)
     {